merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Thu, 12 Apr 2007 16:30:12 +0000 (10:30 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Thu, 12 Apr 2007 16:30:12 +0000 (10:30 -0600)

Trivial merge